Use boolify().

Akinori MUSHA 9 jaren geleden
bovenliggende
commit
04e1515eea
4 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 1 1
      app/models/agents/hipchat_agent.rb
  2. 1 1
      app/models/agents/post_agent.rb
  3. 1 1
      app/models/agents/trigger_agent.rb
  4. 2 2
      app/models/agents/twilio_agent.rb

+ 1 - 1
app/models/agents/hipchat_agent.rb

@@ -43,7 +43,7 @@ module Agents
43 43
       client = HipChat::Client.new(interpolated[:auth_token] || credential('hipchat_auth_token'))
44 44
       incoming_events.each do |event|
45 45
         mo = interpolated(event)
46
-        client[mo[:room_name]].send(mo[:username], mo[:message], :notify => mo[:notify].to_s == 'true' ? 1 : 0, :color => mo[:color])
46
+        client[mo[:room_name]].send(mo[:username], mo[:message], :notify => boolify(mo[:notify]) ? 1 : 0, :color => mo[:color])
47 47
       end
48 48
     end
49 49
   end

+ 1 - 1
app/models/agents/post_agent.rb

@@ -69,7 +69,7 @@ module Agents
69 69
     def receive(incoming_events)
70 70
       incoming_events.each do |event|
71 71
         outgoing = interpolated(event)['payload'].presence || {}
72
-        if interpolated['no_merge'].to_s == 'true'
72
+        if boolify(interpolated['no_merge'])
73 73
           handle outgoing, event.payload
74 74
         else
75 75
           handle outgoing.merge(event.payload), event.payload

+ 1 - 1
app/models/agents/trigger_agent.rb

@@ -102,7 +102,7 @@ module Agents
102 102
     end
103 103
 
104 104
     def keep_event?
105
-      interpolated['keep_event'] == 'true'
105
+      boolify(interpolated['keep_event'])
106 106
     end
107 107
   end
108 108
 end

+ 2 - 2
app/models/agents/twilio_agent.rb

@@ -44,13 +44,13 @@ module Agents
44 44
       incoming_events.each do |event|
45 45
         message = (event.payload['message'].presence || event.payload['text'].presence || event.payload['sms'].presence).to_s
46 46
         if message.present?
47
-          if interpolated(event)['receive_call'].to_s == 'true'
47
+          if boolify(interpolated(event)['receive_call'])
48 48
             secret = SecureRandom.hex 3
49 49
             memory['pending_calls'][secret] = message
50 50
             make_call secret
51 51
           end
52 52
 
53
-          if interpolated(event)['receive_text'].to_s == 'true'
53
+          if boolify(interpolated(event)['receive_text'])
54 54
             message = message.slice 0..160
55 55
             send_message message
56 56
           end